From mboxrd@z Thu Jan 1 00:00:00 1970 From: "corentin.labbe" Subject: Re: [PATCH v3] i2c-ali1535: enable SPARC support Date: Mon, 28 Nov 2011 12:19:11 +0100 Message-ID: <4ED36E2F.3010003@geomatys.fr> References: <20111125142351.739f6b89@endymion.delvare> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20111125142351.739f6b89-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jean Delvare Cc: Linux I2C , Pierre-Yves Rofes List-Id: linux-i2c@vger.kernel.org Le 25/11/2011 14:23, Jean Delvare a =E9crit : > From: "corentin.labbe" >=20 > The i2c-ali1535 driver don't work on SPARC, this is because it assume= s that ioport address are 16bits wide (address stored with an unsigned = short). > But on SPARC arch, ioports are mapped in memory and so are stored wit= h an unsigned long. >=20 > This patch corrects this by using pci_resource_start for getting IOME= M base address, then reading the SMBBA of the i2c busse and using toget= her for I/O access. >=20 > I like to thanks Jean DELVARE for reviewing of my patch. >=20 > Signed-off-by: LABBE Corentin > Signed-off-by: Jean Delvare > --- > Corentin, I rebased your patch so that it applies on top of the fix I > just sent. I also turned one dev_info into dev_dbg, and relaxed the > check on the PCI resource flags: I have no idea if the resource is > always defined, in particular on x86, and as it will be difficult to > find testers, I want to play it safe and guarantee that the driver wi= ll > behave the same way it used to before your patch. >=20 > Corentin, Pierre-Yves, please test this version of the patch on top o= f > the fix I just sent, and confirm that it works for you. It works for me. Thanks for your work. >=20 > If anybody is using the i2c-ali1535 driver on x86, please test too an= d > report. I can provide a standalone driver if needed. >=20 > drivers/i2c/busses/i2c-ali1535.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) >=20 > --- linux-3.2-rc3.orig/drivers/i2c/busses/i2c-ali1535.c 2011-11-25 13= :54:48.000000000 +0100 > +++ linux-3.2-rc3/drivers/i2c/busses/i2c-ali1535.c 2011-11-25 14:12:4= 6.000000000 +0100 > @@ -132,7 +132,8 @@ > #define ALI1535_SMBIO_EN 0x04 /* SMB I/O Space enable */ > =20 > static struct pci_driver ali1535_driver; > -static unsigned short ali1535_smba; > +static unsigned long ali1535_smba; > +static unsigned short ali1535_offset; > =20 > /* Detect whether a ALI1535 can be found, and initialize it, where n= ecessary. > Note the differences between kernels with the old PCI BIOS interf= ace and > @@ -149,16 +150,28 @@ static int __devinit ali1535_setup(struc > - We can use the addresses > */ > =20 > + retval =3D pci_enable_device(dev); > + if (retval) { > + dev_err(&dev->dev, "ALI1535_smb can't enable device\n"); > + goto exit; > + } > + > /* Determine the address of the SMBus area */ > - pci_read_config_word(dev, SMBBA, &ali1535_smba); > - ali1535_smba &=3D (0xffff & ~(ALI1535_SMB_IOSIZE - 1)); > - if (ali1535_smba =3D=3D 0) { > + pci_read_config_word(dev, SMBBA, &ali1535_offset); > + dev_dbg(&dev->dev, "ALI1535_smb is at offset 0x%04x\n", ali1535_off= set); > + ali1535_offset &=3D (0xffff & ~(ALI1535_SMB_IOSIZE - 1)); > + if (ali1535_offset =3D=3D 0) { > dev_warn(&dev->dev, > "ALI1535_smb region uninitialized - upgrade BIOS?\n"); > retval =3D -ENODEV; > goto exit; > } > =20 > + if (pci_resource_flags(dev, 0) & IORESOURCE_IO) > + ali1535_smba =3D pci_resource_start(dev, 0) + ali1535_offset; > + else > + ali1535_smba =3D ali1535_offset; > + > retval =3D acpi_check_region(ali1535_smba, ALI1535_SMB_IOSIZE, > ali1535_driver.name); > if (retval) > @@ -166,7 +179,7 @@ static int __devinit ali1535_setup(struc > =20 > if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE, > ali1535_driver.name)) { > - dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n", > + dev_err(&dev->dev, "ALI1535_smb region 0x%lx already in use!\n", > ali1535_smba); > retval =3D -EBUSY; > goto exit; > @@ -200,7 +213,7 @@ static int __devinit ali1535_setup(struc > */ > pci_read_config_byte(dev, SMBREV, &temp); > dev_dbg(&dev->dev, "SMBREV =3D 0x%X\n", temp); > - dev_dbg(&dev->dev, "ALI1535_smba =3D 0x%X\n", ali1535_smba); > + dev_dbg(&dev->dev, "ALI1535_smba =3D 0x%lx\n", ali1535_smba); > =20 > return 0; > =20 > @@ -501,7 +514,7 @@ static int __devinit ali1535_probe(struc > ali1535_adapter.dev.parent =3D &dev->dev; > =20 > snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name), > - "SMBus ALI1535 adapter at %04x", ali1535_smba); > + "SMBus ALI1535 adapter at %04x", ali1535_offset); > return i2c_add_adapter(&ali1535_adapter); > } > =20 >=20 >=20